(frame-notice-user-settings): Only adjust frame height

for no tool-bar case if tool-bar was originally switched on.

diff --git a/lisp/frame.el b/lisp/frame.el
index 3def9a94ae3d008b82b2c70a2bb395e404890468..c05347c2d4bfabb43366a4cc662f60cbc1bf45c2 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -292,11 +292,12 @@ React to settings of `default-frame-alist', `initial-frame-alist' there."
       (when (display-graphic-p)
        (let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
                                  (assq 'tool-bar-lines default-frame-alist))))
-         (when (or (null tool-bar-lines)
-                   (null (cdr tool-bar-lines))
-                   (eq 0 (cdr tool-bar-lines)))
+         (when (and tool-bar-originally-present
+                     (or (null tool-bar-lines)
+                         (null (cdr tool-bar-lines))
+                         (eq 0 (cdr tool-bar-lines))))
            (let* ((char-height (frame-char-height frame-initial-frame))
-                  (image-height 24)
+                  (image-height tool-bar-images-pixel-height)
                   (margin (cond ((and (consp tool-bar-button-margin)
                                       (integerp (cdr tool-bar-button-margin))
                                       (> tool-bar-button-margin 0))